Use C xenstored with --disable-ocamltools
authorOlaf Hering <olaf@aepfle.de>
Fri, 10 Oct 2014 08:32:24 +0000 (10:32 +0200)
committerIan Campbell <ian.campbell@citrix.com>
Tue, 14 Oct 2014 09:25:13 +0000 (10:25 +0100)
commitd45a0826d00d49d539b89af5e9e8edde6e8907e8
treed3a036000364553d00b9522c543a6c9b8de146b6
parent4346115bee9b75d6a8d28c4d65642368b572cbf9
Use C xenstored with --disable-ocamltools

When xen is configured with --disable-ocamltools then oxenstored will
still be the default if all required ocaml devel packages are installed.
The reason is that xenstored.m4 is included before the ocamltools check.
And xenstored.m4 does not use the result of --disable-ocamltools.

Rearrange the code to check first for the presence of ocaml, then check
--disable-ocamltools and finally decide what sort of xenstored should be
the default.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
[ ijc -- ran autogen.sh as requested]
m4/xenstored.m4
tools/configure
tools/configure.ac